Merge from mainline.
authorXue Fuqiao <xfq.free@gmail.com>
Sun, 9 Jun 2013 08:58:09 +0000 (16:58 +0800)
committerXue Fuqiao <xfq.free@gmail.com>
Sun, 9 Jun 2013 08:58:09 +0000 (16:58 +0800)

Trivial merge